From 524ca3c2d5218d47af9b9f6da2b7bb37c53c9920 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sun, 20 Mar 2016 23:33:25 +0100 Subject: [PATCH] Adwaita: fix treeview spinbutton style --- gtk/theme/Adwaita/_common.scss | 16 ++++++++-------- gtk/theme/Adwaita/gtk-contained-dark.css | 14 +++++++------- gtk/theme/Adwaita/gtk-contained.css | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 53be3001ab..3b5692a0f4 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1171,14 +1171,14 @@ spinbutton { } // Misc - treeview & { - entry, - entry:focus { - padding: 1px; - border-width: 1px 0; - border-color: $selected_bg_color; - border-radius: 0; - box-shadow: none; + treeview &:not(.vertical) { + min-height: 0; + border-style: none; + border-radius: 0; + + entry { + min-height: 0; + padding: 1px 2px; } } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 28544b752a..c6d2c6386c 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1412,13 +1412,13 @@ spinbutton.vertical button.down { box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -treeview spinbutton entry, -treeview spinbutton entry:focus { - padding: 1px; - border-width: 1px 0; - border-color: #215d9c; - border-radius: 0; - box-shadow: none; } +treeview spinbutton:not(.vertical) { + min-height: 0; + border-style: none; + border-radius: 0; } + treeview spinbutton:not(.vertical) entry { + min-height: 0; + padding: 1px 2px; } /************** * ComboBoxes * diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 85de7b97f8..5a40f39558 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1418,13 +1418,13 @@ spinbutton.vertical button.down { box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -treeview spinbutton entry, -treeview spinbutton entry:focus { - padding: 1px; - border-width: 1px 0; - border-color: #4a90d9; - border-radius: 0; - box-shadow: none; } +treeview spinbutton:not(.vertical) { + min-height: 0; + border-style: none; + border-radius: 0; } + treeview spinbutton:not(.vertical) entry { + min-height: 0; + padding: 1px 2px; } /************** * ComboBoxes * -- 2.30.2